Skip to content

Commit 5dd5b91

Browse files
hreis1hreis1
committed
Merge branch 'main' into refactor/controller-de-notificações
2 parents 6cd3055 + 514c87e commit 5dd5b91

File tree

140 files changed

+1995
-794
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+1995
-794
lines changed

‎Gemfile

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ gem 'devise'
1313

1414
gem 'faker'
1515
gem 'faraday'
16+
gem 'friendly_id', '~> 5.5.0'
1617
gem 'image_processing', '>= 1.2'
1718
gem 'jbuilder'
1819
gem 'jsbundling-rails'

‎Gemfile.lock

+3
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@ GEM
136136
webrick (~> 1.7)
137137
websocket-driver (>= 0.6, < 0.8)
138138
ffi (1.16.3)
139+
friendly_id (5.5.1)
140+
activerecord (>= 4.0.0)
139141
globalid (1.2.1)
140142
activesupport (>= 6.1)
141143
i18n (1.14.1)
@@ -339,6 +341,7 @@ DEPENDENCIES
339341
factory_bot_rails
340342
faker
341343
faraday
344+
friendly_id (~> 5.5.0)
342345
image_processing (>= 1.2)
343346
jbuilder
344347
jsbundling-rails

‎Procfile.dev

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
web: env RUBY_DEBUG_OPEN=true bin/rails server
22
js: yarn build --watch
33
css: yarn watch:css
4+
job: bundle exec rake solid_queue:start

‎README.md

+20
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ O Portfoliorrr é uma rede social com funcionalidades de portfólio para pessoas
66

77
- [Informações técnicas](https://github.com/TreinaDev/td11-portfoliorrr?tab=readme-ov-file#informa%C3%A7%C3%B5es-t%C3%A9cnicas)
88
- [Como configurar a aplicação](https://github.com/TreinaDev/td11-portfoliorrr?tab=readme-ov-file#como-configurar-a-aplica%C3%A7%C3%A3o)
9+
- [Ver emails enviados em ambiente de desenvolvimento](https://github.com/TreinaDev/td11-portfoliorrr?tab=readme-ov-file#ver-emails-enviados-em-ambiente-de-desenvolvimento)
910
- [Como visualizar a aplicação no navegador](https://github.com/TreinaDev/td11-portfoliorrr?tab=readme-ov-file#como-visualizar-a-aplica%C3%A7%C3%A3o-no-navegador)
1011
- [Documentação da API](https://github.com/TreinaDev/td11-portfoliorrr?tab=readme-ov-file#documenta%C3%A7%C3%A3o-da-api)
1112

@@ -21,12 +22,31 @@ O Portfoliorrr é uma rede social com funcionalidades de portfólio para pessoas
2122
- Rode o comando `bin/setup` e aguarde sua conclusão;
2223
- Rode o comando `yarn install` (necessário ter `node` instalado em sua máquina);
2324

25+
## Populando o banco de dados
26+
27+
- O seed comum, para desenvolvimento, pode ser feito normalmente com `rails db:seed`
28+
- Para apresentações e testes de front-end, é possível fazer um superseed, utilizando `rails db:seed:superseed`
29+
- O superseed utiliza as gems Faker e FactoryBot, que são instaladas durante a configuração (ver item anterior)
30+
2431
## Como visualizar a aplicação no navegador
2532

2633
- Siga as instruções de configuração da aplicação
2734
- Rode o comando `bin/dev`;
2835
- Acesse a aplicação através do endereço `http://localhost:4000/`
2936

37+
## Ver emails enviados em ambiente de desenvolvimento
38+
39+
- Siga as instruções de configuração da aplicação;
40+
- Instale localmente a gem `mailcatcher` executando o comando abaixo:
41+
```shell
42+
gem install mailcatcher
43+
```
44+
- Execute o comando abaixo para iniciar o `mailcatcher`
45+
```shell
46+
mailcatcher
47+
```
48+
- Acesse o MailCatcher através do endereço `http://localhost:1080`. Todos e-mails enviados serão mostrados nessa página, que emula uma caixa de entrada.
49+
3050
## Como rodar os testes da aplicação
3151

3252
- Siga as instruções de configuração da aplicação

‎app/assets/images/bell.svg

+3
Loading

‎app/assets/images/flag.svg

+3
Loading

‎app/assets/images/newpost.svg

+4
Loading

‎app/assets/images/pencil-square.svg

+4
Loading

‎app/assets/images/share.svg

+3
Loading

‎app/assets/images/three-dots-vertical.svg

+3
Loading

‎app/assets/stylesheets/application.bootstrap.scss

+1-81
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ $theme-colors: (
22
"primary": #a130fd,
33
"secondary": #515253,
44
"success": #2abd4cde,
5-
"info": #68a1f7,
5+
"info": #8fd0f5,
66
"warning": #ffc107,
77
"danger": #dc3545,
88
"light": rgba(255, 251, 251, 0.603),
@@ -18,83 +18,3 @@ $primary: #a130fd;
1818
@import 'posts.scss';
1919
@import 'profile.scss';
2020
@import 'layout.scss';
21-
22-
body{
23-
min-width: 400px;
24-
}
25-
26-
input[type="checkbox"]:checked {
27-
background-color: #a130fd !important;
28-
}
29-
30-
.feed-post:hover{
31-
transform: scale(1.01, 1.01);
32-
transition-duration: 300ms;
33-
}
34-
35-
.img-cover{
36-
object-fit: cover;
37-
object-position: center;
38-
}
39-
40-
.field_with_errors input{
41-
border: 1px solid red !important;
42-
}
43-
44-
.home_logo{
45-
width: 12rem;
46-
margin: 0 7rem 0 7rem;
47-
}
48-
49-
.drop-menu{
50-
margin-right: 2.5rem !important;
51-
}
52-
53-
#searchText{
54-
width: 380px !important;
55-
}
56-
57-
.dropdown-menu[data-bs-popper]{
58-
left: -20px !important;
59-
}
60-
61-
.follower-card:hover{
62-
transform: scale(1.01, 1.01);
63-
transition-duration: 300ms;
64-
}
65-
66-
.profile-image{
67-
min-width: 80px;
68-
}
69-
70-
.trix-content{
71-
color: rgb(10, 10, 10);
72-
}
73-
74-
.dropdown-item:active {
75-
background-color: #9030df !important;
76-
}
77-
78-
.categories{
79-
width: 35% !important;
80-
}
81-
82-
.highlighted {
83-
transform: scale(1.01s);
84-
background-color: hsla(256, 85%, 82%, 0.2);
85-
box-shadow: 0 0 5px 5px rgba(0, 0, 0, 0.2);
86-
transition:
87-
transform 1.5s ease-in-out,
88-
box-shadow 1.5s ease-in-out,
89-
background-color 1.5s ease-in-out;
90-
}
91-
92-
[id^='comment_'] {
93-
transform: reset;
94-
background-color: reset;
95-
box-shadow: reset;
96-
transition:
97-
transform 1s ease-in-out,
98-
box-shadow 1s ease-in-out,
99-
background-color 1s ease-in-out;
100-
}

‎app/assets/stylesheets/layout.scss

+75
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
1+
:root{
2+
font-size: 0.8rem;
3+
}
4+
15
body{
26
min-width: 400px;
7+
background-color: #F6F7F8 !important;
38
}
49

510
ul{
@@ -26,3 +31,73 @@ input[type="checkbox"]:checked {
2631
.categories{
2732
width: 35% !important;
2833
}
34+
35+
.most-followed-users{
36+
size: 22rem;
37+
margin-top: 0.15rem;
38+
}
39+
40+
.home-cards-title{
41+
margin-bottom: 2px !important;
42+
}
43+
44+
.home-cards{
45+
padding: 1rem !important;
46+
margin-bottom: 2px !important;
47+
}
48+
49+
.home-cards a{
50+
text-decoration: none !important;
51+
}
52+
53+
.highlighted {
54+
transform: scale(1.01s);
55+
background-color: hsla(256, 85%, 82%, 0.2);
56+
box-shadow: 0 0 5px 5px rgba(0, 0, 0, 0.2);
57+
transition:
58+
transform 1.5s ease-in-out,
59+
box-shadow 1.5s ease-in-out,
60+
background-color 1.5s ease-in-out;
61+
}
62+
63+
[id^='comment_'] {
64+
transform: reset;
65+
background-color: reset;
66+
box-shadow: reset;
67+
transition:
68+
transform 1s ease-in-out,
69+
box-shadow 1s ease-in-out,
70+
background-color 1s ease-in-out;
71+
}
72+
73+
.page-header{
74+
margin: 0 -0.66rem 0 -0.66rem;
75+
}
76+
77+
.search-result-title:hover{
78+
text-decoration: underline !important;
79+
}
80+
81+
.edit-button{
82+
margin-left: 8rem !important;
83+
}
84+
85+
.page-title{
86+
margin-left: 15.4%;
87+
margin-right: 15.4%;
88+
}
89+
90+
.project-search{
91+
margin-left: 24.9%;
92+
margin-right: 24.9%;
93+
}
94+
95+
.invitation-request-title{
96+
margin-left: 7%;
97+
margin-right: 7%;
98+
}
99+
100+
.notifications{
101+
margin-left: 21% !important;
102+
margin-right: 21% !important;
103+
}

‎app/assets/stylesheets/navbar.scss

+18-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,22 @@
77
}
88

99
.dropdown-item:active {
10-
background-color: #9030df !important;
10+
background-color: #9030df !important;
11+
}
12+
13+
.personal-info-visibility{
14+
list-style: disc !important;
15+
}
16+
17+
.notification-badge{
18+
position: absolute;
19+
right: 5% !important;
20+
}
21+
22+
.badge-container{
23+
position: relative !important;
24+
}
25+
26+
.dropdown-profile-picture{
27+
width: 5rem !important;
1128
}

‎app/assets/stylesheets/posts.scss

+45
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,49 @@
55

66
.trix-content{
77
color: rgb(10, 10, 10);
8+
text-align: left !important;
9+
}
10+
11+
.post-title{
12+
font-size: 1.8rem;
13+
}
14+
15+
figure.attachment{
16+
width: 50% !important;
17+
}
18+
19+
.share-link{
20+
width: 15rem;
21+
}
22+
23+
.home-publication-button{
24+
width: 25vw !important;
25+
margin-right: 5rem;
26+
text-align: left !important;
27+
}
28+
29+
.comment-message, .reply-form{
30+
margin-left: 5.2rem !important;
31+
}
32+
33+
.comment-actions{
34+
margin-left: 5.0rem !important;
35+
}
36+
37+
.reply-content{
38+
margin-left: 4.5rem !important;
39+
}
40+
41+
.reply-form{
42+
min-width: 350px;
43+
}
44+
45+
.reply-collapser{
46+
margin-left: 4.8rem !important;
47+
color: #065fd4 !important;
48+
font-size: medium;
49+
}
50+
51+
.reply-content, .comment-message{
52+
font-size: small;
853
}

‎app/assets/stylesheets/profile.scss

+25-4
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,32 @@
33
transition-duration: 300ms;
44
}
55

6-
.profile-image{
7-
min-width: 80px;
8-
}
9-
106
.img-cover{
117
object-fit: cover;
128
object-position: center;
9+
}
10+
11+
.profile-header-title{
12+
margin: 0 -0.66rem 0.66rem -0.66rem;
13+
}
14+
15+
.profile-header-picture{
16+
transform: translateY(-50%);
17+
}
18+
19+
.profile-picture{
20+
background-color: #F6F7F8 !important;
21+
}
22+
23+
.profile-card-body{
24+
color: #F6F7F8 !important;
25+
}
26+
27+
.profile-info-content{
28+
font-size: 1.11rem;
29+
margin-left: 2.12rem;
30+
}
31+
32+
.profile-info-title{
33+
margin-left: 2rem !important;
1334
}

0 commit comments

Comments
 (0)