Skip to content

Added minerals page #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 31 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
9f0588e
Update Contacts page
kanastasov Jan 26, 2025
d213b9e
fixed header/footer and image
kanastasov Jan 26, 2025
37bcf5e
fixes
kanastasov Jan 26, 2025
15789d4
text modification
kanastasov Jan 27, 2025
a385a5c
Update README.md
kanastasov Jan 27, 2025
c55154c
work on text
kanastasov Jan 28, 2025
e1c8435
Merge branch 'master' of https://github.com/kanastasov/cristals-eshop
kanastasov Jan 28, 2025
b24c575
fixes on cristals
kanastasov Jan 28, 2025
a2b20c2
fixes on display
kanastasov Jan 28, 2025
37cb7b7
added new page for minerals
kanastasov Jan 29, 2025
7220fca
added pages for other required sell items
kanastasov Jan 29, 2025
e43990e
added entities for required data
kanastasov Jan 30, 2025
857ebf7
Merge pull request #1 from kanastasov/frontend
kanastasov Jan 30, 2025
f03421f
crystals wip
kanastasov Jan 31, 2025
f3e0365
crystals redux state wip
kanastasov Jan 31, 2025
ea18beb
Merge pull request #2 from kanastasov/frontend
kanastasov Jan 31, 2025
235b8ba
reverted menu and fixed add description
kanastasov Feb 1, 2025
1c0d190
Merge pull request #3 from kanastasov/frontend
kanastasov Feb 1, 2025
fdc08c9
data work
kanastasov Feb 1, 2025
e280bad
fixed add product from admin page
kanastasov Feb 2, 2025
4ebd733
fixed edit and display data
kanastasov Feb 2, 2025
14beb66
Merge pull request #4 from kanastasov/frontend
kanastasov Feb 3, 2025
3904448
fixes images
kanastasov Feb 4, 2025
6f22d0e
Merge pull request #5 from kanastasov/frontend
kanastasov Feb 4, 2025
7371577
made it to compile with mvn
kanastasov Feb 6, 2025
4dc103c
Merge pull request #6 from kanastasov/frontend
kanastasov Feb 6, 2025
20b8b19
Update README.md
kanastasov Feb 10, 2025
4ce19fb
fixed img size
kanastasov Feb 10, 2025
c0858f0
Merge pull request #7 from kanastasov/frontend
kanastasov Feb 10, 2025
985de92
build project with tar file for superhosting
kanastasov Feb 11, 2025
3ecae33
Merge pull request #8 from kanastasov/frontend
kanastasov Feb 11, 2025
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
Empty file added .metadata/.lock
Empty file.
59 changes: 59 additions & 0 deletions .metadata/.log
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
!SESSION 2025-01-26 09:22:46.360 -----------------------------------------------
eclipse.buildId=4.26.0.20221201-1200
java.version=17.0.5
java.vendor=Oracle Corporation
BootLoader constants: OS=win32, ARCH=x86_64, WS=win32, NL=en_US
Framework arguments: -product org.eclipse.epp.package.jee.product -product org.eclipse.epp.package.jee.product
Command-line arguments: -os win32 -ws win32 -arch x86_64 -product org.eclipse.epp.package.jee.product -data C:\Users\kirep\OneDrive\Desktop\fork-crystals-eshop\cristals-eshop -product org.eclipse.epp.package.jee.product

!ENTRY ch.qos.logback.classic 1 0 2025-01-26 09:22:49.426
!MESSAGE Activated before the state location was initialized. Retry after the state location is initialized.

!ENTRY ch.qos.logback.classic 1 0 2025-01-26 09:22:52.792
!MESSAGE Logback config file: C:\Users\kirep\OneDrive\Desktop\fork-crystals-eshop\cristals-eshop\.metadata\.plugins\org.eclipse.m2e.logback\logback.2.1.0.20221015-0744.xml

!ENTRY org.eclipse.jface 2 0 2025-01-26 09:23:15.226
!MESSAGE Keybinding conflicts occurred. They may interfere with normal accelerator operation.
!SUBENTRY 1 org.eclipse.jface 2 0 2025-01-26 09:23:15.226
!MESSAGE A conflict occurred for CTRL+SHIFT+T:
Binding(CTRL+SHIFT+T,
ParameterizedCommand(Command(org.eclipse.jdt.ui.navigate.open.type,Open Type,
Open a type in a Java editor,
Category(org.eclipse.ui.category.navigate,Navigate,null,true),
WorkbenchHandlerServiceHandler("org.eclipse.jdt.ui.navigate.open.type"),
,,true),null),
org.eclipse.ui.defaultAcceleratorConfiguration,
org.eclipse.ui.contexts.window,,,system)
Binding(CTRL+SHIFT+T,
ParameterizedCommand(Command(org.eclipse.lsp4e.symbolinworkspace,Go to Symbol in Workspace,
,
Category(org.eclipse.lsp4e.category,Language Servers,null,true),
WorkbenchHandlerServiceHandler("org.eclipse.lsp4e.symbolinworkspace"),
,,true),null),
org.eclipse.ui.defaultAcceleratorConfiguration,
org.eclipse.ui.contexts.window,,,system)
!SUBENTRY 1 org.eclipse.jface 2 0 2025-01-26 09:23:15.226
!MESSAGE A conflict occurred for ALT+SHIFT+R:
Binding(ALT+SHIFT+R,
ParameterizedCommand(Command(org.eclipse.jdt.ui.edit.text.java.rename.element,Rename - Refactoring ,
Rename the selected element,
Category(org.eclipse.jdt.ui.category.refactoring,Refactor - Java,Java Refactoring Actions,true),
WorkbenchHandlerServiceHandler("org.eclipse.jdt.ui.edit.text.java.rename.element"),
,,true),null),
org.eclipse.ui.defaultAcceleratorConfiguration,
org.eclipse.ui.contexts.window,,,system)
Binding(ALT+SHIFT+R,
ParameterizedCommand(Command(org.eclipse.ui.edit.rename,Rename,
Rename the selected item,
Category(org.eclipse.ui.category.file,File,null,true),
WorkbenchHandlerServiceHandler("org.eclipse.ui.edit.rename"),
,,true),null),
org.eclipse.ui.defaultAcceleratorConfiguration,
org.eclipse.ui.contexts.window,,,system)

!ENTRY org.eclipse.egit.ui 2 0 2025-01-26 09:23:19.862
!MESSAGE Warning: The environment variable HOME is not set. The following directory will be used to store the Git
user global configuration and to define the default location to store repositories: 'C:\Users\kirep'. If this is
not correct please set the HOME environment variable and restart Eclipse. Otherwise Git for Windows and
EGit might behave differently since they see different configuration options.
This warning can be switched off on the Team > Git > Confirmations and Warnings preference page.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Binary file not shown.
Binary file not shown.
2,886 changes: 2,886 additions & 0 deletions .metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions .metadata/.plugins/org.eclipse.jdt.core/javaLikeNames.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
java
Binary file not shown.
Binary file not shown.
2 changes: 2 additions & 0 deletions .metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<typeInfoHistroy/>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<qualifiedTypeNameHistroy/>
16 changes: 16 additions & 0 deletions .metadata/.plugins/org.eclipse.m2e.core.ui/dialog_settings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<section name="Workbench">
<section name="MavenProjectImportWizardPage">
<list key="rootDirectory">
<item value="C:\Users\kirep\OneDrive\Desktop\fork-crystals-eshop"/>
</list>
<list key="projectNameTemplate">
<item value="[artifactId]"/>
<item value="[artifactId]-TRUNK"/>
<item value="[artifactId]-[version]"/>
<item value="[groupId].[artifactId]"/>
<item value="[groupId].[artifactId]-[version]"/>
<item value="[name]"/>
</list>
</section>
</section>
Binary file not shown.
1 change: 1 addition & 0 deletions .metadata/.plugins/org.eclipse.m2e.logback/0.log
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2025-01-26 09:23:19,863 [Worker-8: Loading available Gradle versions] INFO o.e.b.c.i.u.g.PublishedGradleVersions - Gradle version information cache is out-of-date. Trying to update.
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<configuration scan="true">
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>%date [%thread] %-5level %logger{35} - %msg%n</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>OFF</level> <!-- change to DEBUG to mimic '-consolelog' behaviour -->
</filter>
</appender>

<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<File>${org.eclipse.m2e.log.dir}/0.log</File>
<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
<FileNamePattern>${org.eclipse.m2e.log.dir}/%i.log</FileNamePattern>
<MinIndex>1</MinIndex>
<MaxIndex>10</MaxIndex>
</rollingPolicy>
<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
<MaxFileSize>10MB</MaxFileSize>
</triggeringPolicy>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>%date [%thread] %-5level %logger{35} - %msg%n</pattern>
</encoder>
</appender>

<appender name="EclipseLog" class="org.eclipse.m2e.logback.appender.EclipseLogAppender">
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>WARN</level>
</filter>
</appender>

<appender name="MavenConsoleLog" class="org.eclipse.m2e.logback.appender.MavenConsoleAppender">
</appender>

<root level="INFO">
<appender-ref ref="FILE" />
<appender-ref ref="STDOUT" />
<appender-ref ref="EclipseLog" />
<appender-ref ref="MavenConsoleLog" />
</root>
</configuration>
6 changes: 6 additions & 0 deletions .metadata/.plugins/org.eclipse.oomph.setup/workspace.setup
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<setup:Workspace
xmi:version="2.0"
xmlns:xmi="http://www.omg.org/XMI"
xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
name="workspace"/>
3 changes: 3 additions & 0 deletions .metadata/.plugins/org.eclipse.tips.ide/dialog_settings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<section name="Workbench">
</section>
11 changes: 11 additions & 0 deletions .metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<section name="Workbench">
<section name="ChooseWorkspaceDialogSettings">
<item key="DIALOG_X_ORIGIN" value="196"/>
<item key="DIALOG_Y_ORIGIN" value="58"/>
</section>
<section name="WORKBENCH_SETTINGS">
<list key="ENABLED_TRANSFERS">
</list>
</section>
</section>
2 changes: 2 additions & 0 deletions .metadata/.plugins/org.eclipse.ui.intro/introstate
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<state reopen="false"/>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<section name="Workbench">
<section name="ImportExportAction">
</section>
</section>
6 changes: 6 additions & 0 deletions .metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<workingSetManager>
<workingSet editPageId="org.eclipse.jdt.internal.ui.DynamicSourcesWorkingSet" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1737876197127_0" label="Java Main Sources" name="Java Main Sources"/>
<workingSet editPageId="org.eclipse.jdt.internal.ui.DynamicSourcesWorkingSet" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1737876197144_1" label="Java Test Sources" name="Java Test Sources"/>
<workingSet aggregate="true" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1737876200336_2" label="Window Working Set" name="Aggregate for window 1737876200335"/>
</workingSetManager>
3 changes: 3 additions & 0 deletions .metadata/version.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#Sun Jan 26 09:22:50 EET 2025
org.eclipse.core.runtime=2
org.eclipse.platform=4.26.0.v20221123-1800
Binary file added 3.jpg
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 444.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 7 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
[![Build Status](https://travis-ci.com/merikbest/ecommerce-spring-reactjs.svg?branch=travis-ci-test)](https://travis-ci.com/merikbest/ecommerce-spring-reactjs)
[![codecov](https://codecov.io/gh/merikbest/ecommerce-spring-reactjs/branch/travis-ci-test/graph/badge.svg?token=sEfOfpBHDX)](https://codecov.io/gh/merikbest/ecommerce-spring-reactjs)

# :hibiscus: Perfume webstore
# :hibiscus: Crystals, minerals and soivenirs webstore

E-commerce project developed using Spring Boot and React.js.<br>

#### An actual version of frontend build deployed to AWS S3 and backend deployed to Heroku:
http://perfume-web.tk <br>
Login: [email protected] <br>
Password: admin

Expand Down Expand Up @@ -38,7 +37,7 @@ Password: admin
2. Install Java 8: [link](https://www.oracle.com/ru/java/technologies/javase/javase8-archive-downloads.html)
3. Install Intellij IDEA Ultimate: [link](https://www.jetbrains.com/idea/)
4. Install Postgresql: [link](https://www.postgresql.org/download/)
5. Open pgAdmin and create a new DB (name: perfume and perfumetest) in Postgresql: [link](https://www.guru99.com/postgresql-create-database.html#:~:text=PostgreSQL%20Create%20Database%20using%20pgAdmin)
5. Open pgAdmin and create a new DB (name: crystals and crystalstest) in Postgresql: [link](https://www.guru99.com/postgresql-create-database.html#:~:text=PostgreSQL%20Create%20Database%20using%20pgAdmin)
6. Add Postgresql properties to the application.properties file: [link](https://i.ibb.co/dL77cZS/prop-postgresql.png)
7. Add Lombok and GraphQL plugins to the Intellij IDEA (File/Settings/Plugins)
8. Register new AWS account: [link](https://portal.aws.amazon.com/billing/signup#/start)
Expand All @@ -62,7 +61,7 @@ Password: admin

## Swagger Documentation

https://perfume-websore-api.herokuapp.com/swagger-ui.html <br/>
https://crystals-websore-api.herokuapp.com/swagger-ui.html <br/>
Or show local: <br/>
http://localhost:8080/swagger-ui.html

Expand All @@ -80,10 +79,10 @@ Email template | List of orders
:------------------------:|:-------------------------:
![Email template](https://i.ibb.co/bmKTLPJ/email-template.jpg) | ![List of users](https://i.ibb.co/pLTyF25/6-List-of-orders.jpg)

User profile page | Add perfume page
User profile page | Add crystals page
:------------------------:|:-------------------------:
![User profile page](https://i.ibb.co/qx1Csc8/7-User-profile-page.jpg) | ![Add perfume page](https://i.ibb.co/XbsJPQH/8-Add-perfume-page.jpg)
![User profile page](https://i.ibb.co/qx1Csc8/7-User-profile-page.jpg) | ![Add crystals page](https://i.ibb.co/XbsJPQH/8-Add-crystals-page.jpg)

Edit perfume list | Edit perfume page
Edit crystals list | Edit crystals page
:------------------------:|:-------------------------:
![Edit perfume list](https://i.ibb.co/HFb9wfR/9-Edit-perfume-list.jpg) | ![Edit perfume page](https://i.ibb.co/jH8R8xL/10-Edit-perfume-page.jpg)
![Edit crystals list](https://i.ibb.co/HFb9wfR/9-Edit-crystals-list.jpg) | ![Edit crystals page](https://i.ibb.co/jH8R8xL/10-Edit-crystals-page.jpg)
Loading