Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
42b08b7
Create .gitignore
kruettlip Mar 15, 2018
a2d48db
test file
frithjofhoppe Mar 15, 2018
5b05240
removed test
frithjofhoppe Mar 15, 2018
46b17b4
added sql creation-file
frithjofhoppe Mar 15, 2018
9663241
added DB table-order
kruettlip Mar 15, 2018
42c321d
changed config
frithjofhoppe Mar 15, 2018
5c1d4d1
Merge branch 'dev' of https://github.com/CoffeeCodeSwitzerland/ImageD…
frithjofhoppe Mar 15, 2018
f80ccb1
worked on registration
frithjofhoppe Mar 15, 2018
9af0b8e
modified login
frithjofhoppe Mar 16, 2018
2ad52d7
modified registration
frithjofhoppe Mar 16, 2018
cc787dd
modified registration
frithjofhoppe Mar 16, 2018
bd7f49b
Add page User => Overview
frithjofhoppe Mar 17, 2018
3bd9219
Add function to get count of galleries and images
frithjofhoppe Mar 17, 2018
35b7ddc
Add some status messages
frithjofhoppe Mar 17, 2018
8deaf6f
fixed spelling failure
frithjofhoppe Mar 22, 2018
5bfbe82
worked on image-gallery
frithjofhoppe Mar 22, 2018
4bf3d98
Add possibility to modify user-account
frithjofhoppe Mar 27, 2018
f258c2e
Started to implement the add progress of a gallery
frithjofhoppe Mar 29, 2018
83fbee7
Add notification on credtentials changed
frithjofhoppe Mar 29, 2018
350691e
Add posibility to delete users
frithjofhoppe Apr 23, 2018
ff10d6d
Add the functionality to add a new gallery
frithjofhoppe Apr 25, 2018
14d0a2a
Add the functionality to add a new gallery
frithjofhoppe Apr 25, 2018
cf6a011
working on admin
kruettlip Apr 25, 2018
7f18537
Add the functionality to delete a gallery in the user - and gallery-o…
frithjofhoppe Apr 25, 2018
e99da28
Merge remote-tracking branch 'origin/dev' into dev
frithjofhoppe Apr 25, 2018
f0afed3
Fixed merge conflicts
frithjofhoppe Apr 25, 2018
ba4e159
Fixed merge conflicts
frithjofhoppe Apr 25, 2018
331817c
Add galleries_edit file
frithjofhoppe Apr 25, 2018
95821a3
Update imagedb.sql
kruettlip Apr 26, 2018
7c55852
Add edit model to gallery
frithjofhoppe Apr 26, 2018
aeb4c29
changed design of galleries in admin-view
kruettlip Apr 26, 2018
8153adf
Merge branch 'dev' of https://github.com/CoffeeCodeSwitzerland/ImageD…
frithjofhoppe Apr 26, 2018
f1559b7
Merge branch 'dev' of https://github.com/CoffeeCodeSwitzerland/ImageD…
kruettlip Apr 26, 2018
7f8765d
Add the site to show the image from a gallery
frithjofhoppe Apr 26, 2018
3be290d
Alteration:
frithjofhoppe Apr 27, 2018
0b605d9
Alteration:
frithjofhoppe Apr 27, 2018
6275842
PHP Doc
frithjofhoppe Apr 27, 2018
6208d2e
Alteration:
frithjofhoppe Apr 27, 2018
80c23b5
Add fontawesome css and appen icons to input-tags
frithjofhoppe Apr 27, 2018
fc4c1f5
Modified gitignore
frithjofhoppe Apr 28, 2018
6081ce2
Modified gitignore
frithjofhoppe Apr 28, 2018
8cdee89
Modified gitignore
frithjofhoppe Apr 28, 2018
463ad75
Modified gitignore
frithjofhoppe Apr 28, 2018
26bf87b
Test .gitignore
frithjofhoppe Apr 28, 2018
949cbdd
Updated imagedb.sql by removing a constraint
frithjofhoppe Apr 28, 2018
795ac92
Fixed path issues
frithjofhoppe Apr 30, 2018
c533206
Fixed path issues
frithjofhoppe Apr 30, 2018
8cf01cc
working on admin-user-edit
kruettlip May 3, 2018
77a33d3
Limited the image types which can be uploaded
frithjofhoppe May 3, 2018
1e0bf59
Merge branch 'dev' of https://github.com/CoffeeCodeSwitzerland/ImageD…
frithjofhoppe May 3, 2018
1499a65
Image can now be shown with the lightbox
frithjofhoppe May 3, 2018
619dbce
-Thumbnails have now the same width and height independent of the ori…
frithjofhoppe May 4, 2018
3b10e39
administrator user deletion and edit
kruettlip May 17, 2018
8b5b0dc
Add sorting by tag
frithjofhoppe May 18, 2018
9c8126c
Merge remote-tracking branch 'origin/dev' into dev
frithjofhoppe May 18, 2018
d27cb9e
Add sorting by tag
frithjofhoppe May 18, 2018
31c1060
Add button to remove the sort filter
frithjofhoppe May 18, 2018
c4d6d11
Replaced ordinary with prepared statements
frithjofhoppe May 19, 2018
c403d35
Add method header
frithjofhoppe May 19, 2018
120998e
Add tag edit/add/delete functionality
frithjofhoppe May 20, 2018
aee1709
Modified database add column 'CreatorId' in table
frithjofhoppe May 20, 2018
cb47782
Updated .simp and .png file
frithjofhoppe May 20, 2018
380af73
Improved sorting of images:
frithjofhoppe May 20, 2018
0aa2a07
removed [0] due to prepared statements
kruettlip May 24, 2018
4993896
full administration funcionality done
kruettlip May 24, 2018
b4fe43d
Started to add tag functionality
frithjofhoppe May 24, 2018
027b1c6
Merge remote-tracking branch 'origin/dev' into dev
frithjofhoppe May 24, 2018
b18b0c7
Create XamppMailSetup.md
frithjofhoppe May 24, 2018
d389da3
Update XamppMailSetup.md
frithjofhoppe May 24, 2018
021c193
Update XamppMailSetup.md
frithjofhoppe May 24, 2018
5c78b76
Reset password with mail delivery
frithjofhoppe May 25, 2018
b6a4254
Merge remote-tracking branch 'origin/dev' into dev
frithjofhoppe May 25, 2018
cd42abe
Add js to password reset progress
frithjofhoppe May 25, 2018
a1a2ed0
Merge branch 'master' into dev
kruettlip May 29, 2018
083cf36
outsourced whole functionality
kruettlip Jun 7, 2018
8d38234
Add files via upload
frithjofhoppe Jun 7, 2018
9e76696
Added Change-Request
kruettlip Jun 7, 2018
48a170e
Add files via upload
frithjofhoppe Jun 7, 2018
2f4b5f2
Sace changes
frithjofhoppe Jun 9, 2018
1dd4759
Merge branch 'dev' of https://github.com/CoffeeCodeSwitzerland/ImageD…
frithjofhoppe Jun 9, 2018
be867b3
Removed obsolet detailstudie
frithjofhoppe Jun 9, 2018
ab53f8e
Add Detailstudie pdf
frithjofhoppe Jun 9, 2018
af3749b
changed name
frithjofhoppe Jun 9, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,7 @@ com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties


#Exclude the images
storage/galleries/**/**/
19 changes: 19 additions & 0 deletions .idea/dataSources.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/sqldialects.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added doc/Aenderungsantrag.pdf
Binary file not shown.
10 changes: 10 additions & 0 deletions doc/DBTableOrder.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Database Table Order
This table order shows us, in which order the tables of the database have to be created or deleted.
Following order **has to be** implemented due to constraints:
- Tag
- User
- Gallery
- Image
- ImageTag
- Right
- Authority
Binary file added doc/Detailstudie_ImageDb.docx
Binary file not shown.
90 changes: 62 additions & 28 deletions doc/ImageDB.simp
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@
</counter>
</entity-names>
<entity-ids>
<counter>
<item-type type-id="" type="AbstractElementGroup" />
<value>283</value>
</counter>
<counter>
<item-type type-id="erd-entity" type="ErdEntity" />
<value>13</value>
</counter>
<counter>
<item-type type-id="erd-relationship" type="ErdRelation" />
<value>14</value>
<value>18</value>
</counter>
<counter>
<item-type type-id="" type="AbstractElementGroup" />
<value>81</value>
</counter>
</entity-ids>
<diagrams>
Expand All @@ -35,12 +35,13 @@
<fields>
<counter>
<type>SoftwareIdeasModeler.Core.DiagramItems.Erd.ErdEntityAttribute</type>
<value>28</value>
<value>30</value>
</counter>
</fields>
</counters>
<alias-groups />
<management uid="md-bce858e684c14513bf5d95e8829ebbac" name="" task-id-sequence="0">
<working-schedule uid="ws-4824f1f0fade4f00ba4620c92eaeaf7c" hours="8" monday="8" tuesday="8" wednesday="8" thursday="8" friday="8" saturday="0" sunday="0" />
<persons>
<person id="P31ebf5cb4cc64db3a50010fd1ec46bfb">
<first-name>Frithjof</first-name>
Expand All @@ -50,6 +51,16 @@
<phone-number />
<description />
<color>#00000000</color>
<working-schedule uid="ws-deb422f435d24afc9bc6f45a99509972" hours="8" monday="8" tuesday="8" wednesday="8" thursday="8" friday="8" saturday="0" sunday="0" />
</person>
<person id="Pe3f98fbfef34466e99fb61a63e4a999e">
<first-name />
<last-name />
<role />
<e-mail />
<phone-number />
<description />
<color>#00000000</color>
</person>
</persons>
<teams />
Expand Down Expand Up @@ -81,7 +92,7 @@
</meta>
<abstract-items />
<sub-models />
<diagram type="entity-relationship" id="pcfe2df5ea63a463488fb0e7a0d9b1797_170126143" name="EntityRelationshipDiagram1" order-index="1" uid="" show-id="false" show-name="true" show-parent-name="false" name-style="local-auto-parents" show-stereotypes="true" show-tagged-values="false" show-template-parameters="true" show-fields="true" show-empty-compartments="true" show-special-indicators="false" show-attributes="true" show-attribute-visibility="true" show-operations="true" show-operation-parameters="true" show-operation-visibility="true" show-nullability="true" show-sequence-number="false" show-extension-points="false" show-relationship-texts="true" show-description="false" show-field-description="false" auto-routed-paths="false">
<diagram type="entity-relationship" id="pcfe2df5ea63a463488fb0e7a0d9b1797_170126143" name="EntityRelationshipDiagram1" order-index="1" uid="" show-id="false" show-name="true" show-parent-name="false" name-style="local-auto-parents" show-stereotypes="true" show-tagged-values="false" show-template-parameters="true" show-fields="true" show-empty-compartments="true" show-special-indicators="false" show-attributes="true" show-attribute-visibility="true" show-operations="true" show-operation-parameters="true" show-operation-visibility="true" show-nullability="true" show-sequence-number="false" show-extension-points="false" show-relationship-texts="true" show-description="false" show-field-description="false" auto-routed-paths="false" view-location="71,-32" zoom="0.7">
<style>
<background-color index="1" color="#FFFFFFFF" />
<background-color index="2" color="#FFFFFFFF" />
Expand All @@ -93,7 +104,7 @@
</authors>
<description />
<creation-date>03/08/2018 13:18:53</creation-date>
<change-date>03/08/2018 14:17:45</change-date>
<change-date>05/20/2018 22:40:47</change-date>
<revision-count>0</revision-count>
<version />
</meta>
Expand Down Expand Up @@ -139,6 +150,9 @@
<attribute uid="a2c877ab6735a406c91b9879ddae63389885" cid="ELEM010" name="DirectoryPath" type="" type-id="" type-size="" foreign-key="false" primary-key="false" nullable="false" description="" default-value="" auto-increment="false">
<style class="default" />
</attribute>
<attribute uid="a2e41498f12a44e91a5aeb5a35ba0908a539" cid="ELEM028" name="ShowTitle" type="" type-id="" type-size="" foreign-key="false" primary-key="false" nullable="false" description="" default-value="" auto-increment="false">
<style class="default" />
</attribute>
</attributes>
<indexes />
</item>
Expand Down Expand Up @@ -225,6 +239,9 @@
<attribute uid="ac797b4afe62f439cb59f99736de57a2059" cid="ELEM023" name="Name" type="" type-id="" type-size="" foreign-key="false" primary-key="false" nullable="false" description="" default-value="" auto-increment="false">
<style class="default" />
</attribute>
<attribute uid="a22d44d1da98f4bc99b5bd7623995d75d858" cid="ELEM029" name="CreatorId" type="" type-id="" type-size="" foreign-key="true" primary-key="false" nullable="false" description="" default-value="" auto-increment="false">
<style class="default" />
</attribute>
</attributes>
<indexes />
</item>
Expand All @@ -236,7 +253,7 @@
</attribute-pairs>
</erd-relation>
</item>
<item id="di800667366799012759" cid="REL003" type="erd-relationship" name="" style-class="" visibility="package" change-tracking-state="added" creator="P31ebf5cb4cc64db3a50010fd1ec46bfb" creation-date="03/08/2018 14:12:32" from="di712206103453409817" to="di606081115213685863">
<item id="di832424118624440634" cid="REL015" type="erd-relationship" name="" style-class="" visibility="package" change-tracking-state="added" creator="Pe3f98fbfef34466e99fb61a63e4a999e" creation-date="05/20/2018 22:39:53" from="di606081115213685863" to="di712206103453409817">
<style class="default" />
<erd-relation type="Identifying" multiplicity-from="1" multiplicity-to="*">
<attribute-pairs>
Expand Down Expand Up @@ -284,6 +301,14 @@
</attribute-pairs>
</erd-relation>
</item>
<item id="di131408430779320736" cid="REL017" type="erd-relationship" name="" style-class="" visibility="package" change-tracking-state="added" creator="Pe3f98fbfef34466e99fb61a63e4a999e" creation-date="05/20/2018 22:40:47" from="di447691943492916114" to="di374083896815037021">
<style class="default" />
<erd-relation type="Identifying" multiplicity-from="1" multiplicity-to="*..*">
<attribute-pairs>
<attribute-pair from-attribute="" to-attribute="" />
</attribute-pairs>
</erd-relation>
</item>
</abstract-items>
<layer id="7cc6876e8dad4c4e8e4c7596beccb9a2" name="Default" visible="true" enabled="true" locked="false">
<item id="di818162100803953366" iid="0f1a16eb38ac4bb8ac12153049c4cc56" creation-date="03/08/2018 13:57:05" order-index="1" type="entity">
Expand All @@ -294,39 +319,30 @@
<layout ax="496.5" ay="61" awidth="245" aheight="122" x="496.5" y="61" width="245" height="122" />
<erd-entity show-nullability="true" />
</item>
<item id="di374083896815037021" iid="4c394fcffce24e1a8e57de7152c88092" creation-date="03/08/2018 14:09:12" order-index="5" type="entity">
<layout ax="186" ay="313.5" awidth="203" aheight="101" x="186" y="313.5" width="203" height="101" />
<erd-entity show-nullability="true" />
</item>
<item id="di447691943492916114" iid="95c0e18a88b8423694b468f960ed5831" creation-date="03/08/2018 13:46:19" order-index="0" type="entity">
<layout ax="890" ay="294.5" awidth="203" aheight="139" x="890" y="294.5" width="203" height="139" />
<erd-entity show-nullability="true" />
</item>
<item id="di606081115213685863" iid="aa8db16ce37b41e493cc0280a7f6607b" creation-date="03/08/2018 14:09:42" order-index="6" type="entity">
<layout ax="180.5" ay="67.25" awidth="214" aheight="109.5" x="180.5" y="67.25" width="214" height="109.5" />
<item id="di374083896815037021" iid="4c394fcffce24e1a8e57de7152c88092" creation-date="03/08/2018 14:09:12" order-index="5" type="entity">
<layout ax="1195" ay="313.5" awidth="203" aheight="101" x="1195" y="313.5" width="203" height="101" />
<erd-entity show-nullability="true" />
</item>
<item id="di285344306526841128" iid="a39fc0f920c4426fbc37e85458074d1a" creation-date="03/08/2018 14:12:28" order-index="7" type="relation">
<layout start-role-position="25,15" end-role-position="25,-15" line-style="oblique" lock-start-point="true" lock-end-point="true" lock-to-fields="false" auto-path="" x1="288" y1="314" x2="288" y2="177" start-border-pos="0.125615763546798" end-border-pos="0.624415887850467" name-position="0,0">
<points>
<point x="288" y="314" />
<point x="288" y="177" />
</points>
</layout>
<relation from="di374083896815037021" from-iid="4c394fcffce24e1a8e57de7152c88092" to="di606081115213685863" to-iid="aa8db16ce37b41e493cc0280a7f6607b" />
<item id="di606081115213685863" iid="aa8db16ce37b41e493cc0280a7f6607b" creation-date="03/08/2018 14:09:42" order-index="6" type="entity">
<layout ax="1189.5" ay="67.25" awidth="214" aheight="109.5" x="1189.5" y="67.25" width="214" height="109.5" />
<erd-entity show-nullability="true" />
</item>
<item id="di538237965904064321" iid="0d6129f5f35f45c4834bf803e059b8b3" creation-date="03/08/2018 14:01:53" order-index="3" type="entity">
<layout ax="520" ay="564" awidth="198" aheight="101" x="520" y="564" width="198" height="101" />
<erd-entity show-nullability="true" />
</item>
<item id="di800667366799012759" iid="99aa7e9ce1f042a8941559951f495c84" creation-date="03/08/2018 14:12:32" order-index="8" type="relation">
<layout start-role-position="25,15" end-role-position="25,-15" line-style="oblique" lock-start-point="true" lock-end-point="true" lock-to-fields="false" auto-path="" x1="496" y1="122" x2="394" y2="122" start-border-pos="0.875" end-border-pos="0.375" name-position="0,0">
<item id="di285344306526841128" iid="a39fc0f920c4426fbc37e85458074d1a" creation-date="03/08/2018 14:12:28" order-index="7" type="relation">
<layout start-role-position="25,15" end-role-position="25,-15" line-style="oblique" lock-start-point="true" lock-end-point="true" lock-to-fields="false" auto-path="" x1="1297" y1="314" x2="1297" y2="177" start-border-pos="0.125615763546798" end-border-pos="0.624415887850467" name-position="0,0">
<points>
<point x="496" y="122" />
<point x="394" y="122" />
<point x="1297" y="314" />
<point x="1297" y="177" />
</points>
</layout>
<relation from="di712206103453409817" from-iid="2994fe4a5131450a8710db1340a2a099" to="di606081115213685863" to-iid="aa8db16ce37b41e493cc0280a7f6607b" />
<relation from="di374083896815037021" from-iid="4c394fcffce24e1a8e57de7152c88092" to="di606081115213685863" to-iid="aa8db16ce37b41e493cc0280a7f6607b" />
</item>
<item id="di416551397101956412" iid="a79464aa215e472890e09aea4d277387" creation-date="03/08/2018 14:07:02" order-index="4" type="entity">
<layout ax="204.5" ay="553.5" awidth="190" aheight="122" x="204.5" y="553.5" width="190" height="122" />
Expand Down Expand Up @@ -377,6 +393,24 @@
</layout>
<relation from="di818162100803953366" from-iid="0f1a16eb38ac4bb8ac12153049c4cc56" to="di712206103453409817" to-iid="2994fe4a5131450a8710db1340a2a099" />
</item>
<item id="di832424118624440634" iid="200fff1d279e43f39645ade968bd7c9c" creation-date="05/20/2018 22:39:53" order-index="14" type="relation">
<layout start-role-position="25,15" end-role-position="25,-15" line-style="oblique" lock-start-point="true" lock-end-point="true" lock-to-fields="false" auto-path="" x1="1190" y1="122" x2="742" y2="122" start-border-pos="0.875" end-border-pos="0.375" name-position="0,0">
<points>
<point x="1190" y="122" />
<point x="742" y="122" />
</points>
</layout>
<relation from="di606081115213685863" from-iid="aa8db16ce37b41e493cc0280a7f6607b" to="di712206103453409817" to-iid="2994fe4a5131450a8710db1340a2a099" />
</item>
<item id="di131408430779320736" iid="3aaf2a9c3a4c4df89e5591e75d124f34" creation-date="05/20/2018 22:40:47" order-index="15" type="relation">
<layout start-role-position="25,15" end-role-position="25,-15" line-style="oblique" lock-start-point="true" lock-end-point="true" lock-to-fields="false" auto-path="" x1="1093" y1="364" x2="1195" y2="364" start-border-pos="0.375" end-border-pos="0.875" name-position="0,0">
<points>
<point x="1093" y="364" />
<point x="1195" y="364" />
</points>
</layout>
<relation from="di447691943492916114" from-iid="95c0e18a88b8423694b468f960ed5831" to="di374083896815037021" to-iid="4c394fcffce24e1a8e57de7152c88092" />
</item>
</layer>
</diagram>
</model>
Expand Down
Binary file added doc/ImageDB_Aenderungsantrag.pdf
Binary file not shown.
Binary file modified doc/ImageDB_ERM.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/ImageDB_Vergleich_DB_FileSystem.pdf
Binary file not shown.
Binary file added doc/Vergleich_DB_FileSystem_ImageDB.pdf
Binary file not shown.
23 changes: 23 additions & 0 deletions doc/XamppMailSetup.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# XAMPP mail setup
To make the email function working apply following chagnes to your xampp-server.
After you adopted the changes please restart the server

## php.ini
Go to the php.ini file, uncommit the property "send_mail" and set the path which points to Xampp\sendmail\sendmail.exe
```
[mail function]
sendmail_paht="D:\Xampp\sendmail\sendmail.exe -t -i"
```

## sendmail.ini
Afterwards apply the following modifications in the sendmail.ini file
```
[sendmail]
smtp_server=smtp.gmail.com
smtp_port=465
smtp_ssl=auto
default_domain=gmail.com
auth_username=imagedb.coffeecode@gmail.com
auth_password={{here woule be the account password}}
hostname=gmail.com
```
Loading