Major progress to images on s3

Author: devinmatte

.gitignore

@@ -34,5 +34,5 @@ _Local Working Files/*
 web.config
 vwd.webinfo
 WebEssentials-Settings.json
-/vendor/
+vendor
 composer.lock

.htaccess

@@ -20,6 +20,10 @@ RewriteCond %{HTTP:Accept} application/json [NC]
 RewriteRule ^(schedule|generate|entity|search|status|rmp)(?:/([^/]*))*$ api/$1.php [L]
 RewriteRule ^schedule/[^/]*/ical$ api/schedule.php [L]
 
+# Redirect all images to assets
+# TODO Get it to redirect properly
+RewriteRule /([^.]+\.png)$ https://assets.csh.rit.edu/schedulemaker/$1 [R=301,L,NC]
+
 # Don't rewrite files or directories
 RewriteCond %{REQUEST_FILENAME} -f [OR]
 RewriteCond %{REQUEST_FILENAME} -d

.nvmrc

@@ -0,0 +1 @@
+10

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.1-apache
+FROM php:7.3-apache
 MAINTAINER Devin Matte <[email protected]>
 
 ADD apache-config.conf /etc/apache2/sites-enabled/000-default.conf
@@ -8,22 +8,26 @@ RUN a2enmod rewrite && a2enmod headers && a2enmod expires && \
     chmod og+rwx /var/lock/apache2 && chmod -R og+rwx /var/run/apache2
 
 RUN apt-get -yq update && \
-    apt-get -yq install gnupg libmagickwand-dev --no-install-recommends && \
+    apt-get -yq install gnupg imagemagick libmagickwand-dev --no-install-recommends && \
     apt-get -yq clean all
 
 RUN docker-php-ext-install mysqli && \
     pecl install imagick && docker-php-ext-enable imagick
 
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+
 COPY . /var/www/html
 
-RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - && \
-    apt-get -yq update && \
-    apt-get -yq install nodejs && \
-    npm install && \
-    npm run-script build && \
-    rm -rf node_modules && \
-    apt-get -yq remove nodejs && \
-    apt-get -yq clean all
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \
+    && apt-get -yq update \
+    && apt-get -yq install nodejs \
+    && npm install \
+    && npm run-script build \
+    && rm -rf node_modules \
+    && apt-get -yq remove nodejs \
+    && apt-get -yq clean all
+
+RUN composer install
 
 EXPOSE 8080
 EXPOSE 8443

api/generate.php

@@ -16,7 +16,7 @@
 require_once "../inc/databaseConn.php";
 require_once "../inc/timeFunctions.php";
 require_once "../inc/ajaxError.php";
-require_once "src/Generate.php";
+require_once "../api/src/Generate.php";
 
 // IMPORTS
 use API\Generate;