Kaynağa Gözat

update to use sqlpage grocery UI

Pi 5 ay önce
ebeveyn
işleme
6acc64731b
4 değiştirilmiş dosya ile 10 ekleme ve 13 silme
  1. 2 1
      .gitmodules
  2. 3 9
      docker-compose.yml
  3. 1 1
      grocery-transactions
  4. 4 2
      index.html

+ 2 - 1
.gitmodules

@@ -7,4 +7,5 @@
 	path = grocery-transactions
 	url = https://gogs.shandan.one/gogsadmin/grocery-manager.git
 	#branch = vertical-button-groups
-	branch = master
+	#branch = master
+        branch = sqlpage

+ 3 - 9
docker-compose.yml

@@ -31,17 +31,11 @@ services:
     restart: always
 
   grocery-pyapi:
-    image: grocery-pyapi
+    image: lovasoa/sqlpage
     hostname: grocery-pyapi
-    build:
-      context: ./grocery-transactions
-      dockerfile: app/rest/Dockerfile
-    environment:
-      HOST: 192.168.0.20
-      USER: pi
-      PASSWORD: ${GROCERYDB_PASSWORD}
     volumes:
-      - ./grocery-files:/usr/src/app/app/rest/static/files
+      - ./grocery-transactions/sqlpage:/var/www/
+      - ./sqlpage.json:/etc/sqlpage/sqlpage.json
     expose:
       - 6772
     networks:

+ 1 - 1
grocery-transactions

@@ -1 +1 @@
-Subproject commit 766a0314249376a87969b5174c47adae52a7b8fd
+Subproject commit 55fa7b6f56889aeebca0c4c1685c0eea09470eba

+ 4 - 2
index.html

@@ -190,11 +190,13 @@
     </form>
   </div>
   <div class="pure-u-1-2 pure-u-sm-1-2 pure-u-md-1-3 pure-u-lg-1-4 l-box">
-    <form action="/grocery/trend"
+    <form action="/grocery/internal/apply.sql"
       id="grocery-trend" rel="external" method="get" target="_self">
       <div class="card">
         <button form="grocery-trend" style="color: tomato; border-color: tomato">
-          <input type="text" name="group" value="Fish, Meat, Eggs" hidden="true"/> 
+          <input type="text" name="groups[]" value="Fish, Meat, Eggs" hidden="true"/> 
+          <input type="text" name="apply" value="Apply" hidden="true"/> 
+          <input type="text" name="title" value="Trend" hidden="true"/> 
           <div class="image">
             <a href="https://en.wikipedia.org/wiki/File:Shopping_cart_with_food_clip_art_2.svg"><img width="64" alt="Shopping Cart with food clip art. CDC" src="/grocery/static/favicon_square.svg"></a>
           </div>