Merge pull request #5 from lucideus-repo/dev

Dev
minadoom · Jun 10, 2020 · c49cb26 · c49cb26
2 parents c1fa027 + ba1c002
commit c49cb26
Show file tree

Hide file tree

Showing 472 changed files with 84,342 additions and 75 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Backend/.DS_Store b/Backend/.DS_Store
diff --git a/Backend/apache/Dockerfile b/Backend/apache/Dockerfile
@@ -1,10 +1,11 @@
 FROM httpd:2.4.33-alpine
 RUN apk update
 COPY my.apache.conf /usr/local/apache2/conf/my.apache.conf
+COPY .htaccess /var/www/html/.htaccess
 RUN echo "Include /usr/local/apache2/conf/my.apache.conf" \
     >> /usr/local/apache2/conf/httpd.conf
 RUN sed -i '/LoadModule rewrite_module/s/^#//g' /usr/local/apache2/conf/httpd.conf
-
+RUN sed -i '/LoadModule headers_module/s/^#//g' /usr/local/apache2/conf/httpd.conf
 RUN { \
   echo 'IncludeOptional conf.d/*.conf'; \
 } >> /usr/local/apache2/conf/httpd.conf \

diff --git a/Backend/apache/my.apache.conf b/Backend/apache/my.apache.conf
@@ -2,7 +2,8 @@ ServerName localhost
 
 LoadModule deflate_module /usr/local/apache2/modules/mod_deflate.so
 LoadModule proxy_module /usr/local/apache2/modules/mod_proxy.so
-LoadModule proxy_fcgi_module /usr/local/apache2/modules/mod_proxy_fcgi.so\
+
+LoadModule proxy_fcgi_module /usr/local/apache2/modules/mod_proxy_fcgi.so
 
 <VirtualHost *:80>
     # Proxy .php requests to port 9000 of the php-fpm container
@@ -15,8 +16,13 @@ LoadModule proxy_fcgi_module /usr/local/apache2/modules/mod_proxy_fcgi.so\
         AllowOverride All
         Require all granted
     </Directory>
-
+    <IfModule headers_module>
+        Header set Access-Control-Allow-Origin "*"
+        Header set Access-Control-Allow-Headers "*"
+        Header set Access-Control-Allow-Methods "*"
+        Header set Access-Control-Allow-Credentials "true"
+    </IfModule>
     # Send apache logs to stdout and stderr
     CustomLog /proc/self/fd/1 common
     ErrorLog /proc/self/fd/2
-</VirtualHost>
+</VirtualHost>
diff --git a/Backend/docker-compose.yml b/Backend/docker-compose.yml
@@ -12,7 +12,7 @@ services:
       MYSQL_USER: phpmyadmin
       MYSQL_PASSWORD: 531486b2bf646636a6a1bba61e78ec4a4a54efbd
       MYSQL_DATABASE: abstractwallet
-    networks: 
+    networks:
       - backend
 
   server:
@@ -25,10 +25,21 @@ services:
       - 80:80
     volumes:
       - ./src/:/var/www/html/
-
+
+  web:
+    build:
+      context: './web'
+      dockerfile: Dockerfile
+    depends_on:
+      - server
+    networks:
+      - frontend
+    ports:
+      - 3000:80
+
   php:
     build: './php/'
-    depends_on: 
+    depends_on:
       - db
     networks:
       - backend
@@ -37,5 +48,5 @@ services:
     command: /tmp/wait-for-it.sh -t 0 database:3306 -- php-fpm
 
 networks:
+  frontend:
   backend:
-
diff --git a/Backend/src/.DS_Store b/Backend/src/.DS_Store