Merge branch 'webapp' of https://github.com/glycojones/privateer into…

… new_figures
glycojones · Nov 10, 2023 · d9a9437 · d9a9437
2 parents 9c2f52a + 54c2a46
commit d9a9437
Show file tree

Hide file tree

Showing 36 changed files with 656 additions and 253 deletions.
diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
@@ -1,14 +1,14 @@
 
-name: Privateer Webserver Backend
+name: Privateer Web App Backend
 
 on:
   push:
-    branches: [ "webserver" ]
+    branches: [ "webapp" ]
     paths: 
       - src/privateer/cpp/privateer-bind.cpp
 
   pull_request:
-    branches: [ "webserver" ]
+    branches: [ "webapp" ]
     paths: 
       - src/privateer/cpp/privateer-bind.cpp
 

diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
@@ -1,8 +1,8 @@
-name: Privateer Webserver Frontend CI/CD
+name: Privateer Web App Frontend CI/CD
 
 on:
   pull_request:
-    branches: [ "webserver" ]
+    branches: [ "webapp" ]
     paths: 
       - webserver/**
 

diff --git a/.github/workflows/frontend_merge.yml b/.github/workflows/frontend_merge.yml
@@ -1,8 +1,8 @@
-name: Privateer Webserver Frontend CI/CD
+name: Privateer Web App Frontend CI/CD
 
 on:
   push:
-    branches: [ "webserver" ]
+    branches: [ "webapp" ]
     paths: 
       - webserver/**
 

diff --git a/.gitignore b/.gitignore
@@ -105,4 +105,5 @@ old_cmake*/*
 *.mov
 *.zip
 dependencies/gemmi
-web/*
+web/*
+*___api___*
diff --git a/webserver/index.html b/webserver/index.html
@@ -34,6 +34,6 @@
 </head>
 <body>
 <div id="root"></div>
-<script src="/src/main.jsx" type="module"></script>
+<script src="/src/main.tsx" type="module"></script>
 </body>
 </html>
-Original file line number
+Diff line change
@@ Expand Up / @@ -105,4 +105,5 @@ old_cmake*/* @@
     *.mov
     *.zip
     dependencies/gemmi
-    web/*
+    web/*
+    *___api___*